Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 8 Feb 2010 22:13:26 +0000 (22:13 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 8 Feb 2010 22:13:26 +0000 (22:13 +0000)

Trivial merge